Merge pull request #7815 from alexknop/conflictdialogfix
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Tue, 11 Feb 2025 10:14:43 +0000 (11:14 +0100)
committerGitHub <noreply@github.com>
Tue, 11 Feb 2025 10:14:43 +0000 (11:14 +0100)
commit2cb35b951a100c2087b9707c44557e529ae1c52f
treeda992b245113b2062d49f58af8b28ec84c9239a3
parent29858d03b1acb42a33265918c90d8e7d8ac1aebc
parent854de28c98a5d6f6ad07648a7190c3c0d15589c7
Merge pull request #7815 from alexknop/conflictdialogfix

Fix Height for Resolve Conflicts Dialog